arm64: ptrace: Avoid ABI change in 4.9.6
authorBen Hutchings <ben@decadent.org.uk>
Fri, 27 Jan 2017 04:53:54 +0000 (04:53 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 28 Jan 2017 16:11:16 +0000 (16:11 +0000)
Commit aeb1f39d814b "arm64/ptrace: Avoid uninitialised struct padding
in fpr_set()" added a new member to struct user_fpsimd_state, but it
takes the place of what was padding (for 128-bit alignment).  Hide
this from genksyms.

Gbp-Pq: Topic debian
Gbp-Pq: Name arm64-ptrace-avoid-abi-change-in-4.9.6.patch

arch/arm64/include/uapi/asm/ptrace.h

index d1ff83dfe5deae580cdb0ebf93f25b32a63f5a74..b2e3fb302d2690885560db088bf50c2c089b4d6e 100644 (file)
@@ -77,7 +77,9 @@ struct user_fpsimd_state {
        __uint128_t     vregs[32];
        __u32           fpsr;
        __u32           fpcr;
+#if !defined(__KERNEL__) || !defined(__GENKSYMS__)
        __u32           __reserved[2];
+#endif
 };
 
 struct user_hwdebug_state {